projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35537bc
)
imx: mx5: lowlevel_init: Simplify code
author
Benoît Thébaudeau
<
[email protected]
>
Thu, 11 Apr 2013 09:35:38 +0000
(09:35 +0000)
committer
Albert ARIBAUD
<
[email protected]
>
Fri, 12 Apr 2013 05:55:04 +0000
(07:55 +0200)
Don't use several instructions to build constant values.
Signed-off-by: Benoît Thébaudeau <
[email protected]
>
Acked-by: Stefano Babic <
[email protected]
>
arch/arm/cpu/armv7/mx5/lowlevel_init.S
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv7/mx5/lowlevel_init.S
b/arch/arm/cpu/armv7/mx5/lowlevel_init.S
index 6d9396a97670d87aad34358129b037fbceb40478..dfce0ca83ee45193122c8844f2df9932b9a654c0 100644
(file)
--- a/
arch/arm/cpu/armv7/mx5/lowlevel_init.S
+++ b/
arch/arm/cpu/armv7/mx5/lowlevel_init.S
@@
-309,8
+309,7
@@
setup_pll_func:
ldr r0, =CCM_BASE_ADDR
ldr r1, =0x00015154
str r1, [r0, #CLKCTL_CBCMR]
- ldr r1, =0x02888945
- orr r1, r1, #(1 << 16)
+ ldr r1, =0x02898945
str r1, [r0, #CLKCTL_CBCDR]
/* make sure change is effective */
1: ldr r1, [r0, #CLKCTL_CDHIPR]
@@
-321,10
+320,7
@@
setup_pll_func:
/* Switch peripheral to PLL2 */
ldr r0, =CCM_BASE_ADDR
- ldr r1, =0x00808145
- orr r1, r1, #(2 << 10)
- orr r1, r1, #(0 << 16)
- orr r1, r1, #(1 << 19)
+ ldr r1, =0x00888945
str r1, [r0, #CLKCTL_CBCDR]
ldr r1, =0x00016154